*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec9915ea74fb652964571e7031bb3bca2bc89538..0d25dc3ea7023a52c46fd7a6d0c4b4a7831f20af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-18  Richard M. Stallman  <rms@gnu.org>
+
+       * dired.el (dired-mark-pop-up): Doc fix.
+
+       * ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs): Put the
+       definition straight into loaddefs.el as well as executing it here.
+
 2002-09-18  Colin Walters  <walters@debian.org>
 
        * calc/calc.el (calc-mode): Add font-lock-defontify to